merge with xen-unstable.hg

diff --cc buildconfigs/linux-defconfig_xen0_ia64
Simple merge

diff --cc buildconfigs/linux-defconfig_xen_ia64
Simple merge

diff --cc linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
index 8b5cf74d97212a2c7e9a69408305536c87855753,00f5785dd8d5c78f8c88a263764ad3a39744ca26..29ee1c4b1e09ccfde5cb595904712bb8fee95867
--- 1/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- 2/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
@@@ -513,6 -518,19 +513,12 @@@ static int __init blkif_init(void
                return -ENODEV;
  
        mmap_pages            = blkif_reqs * BLKIF_MAX_SEGMENTS_PER_REQUEST;
 -#ifdef CONFIG_XEN_IA64_DOM0_NON_VP
 -      extern unsigned long alloc_empty_foreign_map_page_range(
 -              unsigned long pages);
 -      mmap_vstart = (unsigned long)
 -              alloc_empty_foreign_map_page_range(mmap_pages);
 -#else /* ! ia64 */
+ 
 -#endif
+       page = balloon_alloc_empty_page_range(mmap_pages);
+       if (page == NULL)
+               return -ENOMEM;
+       mmap_vstart = (unsigned long)pfn_to_kaddr(page_to_pfn(page));
+ 
        pending_reqs          = kmalloc(sizeof(pending_reqs[0]) *
                                        blkif_reqs, GFP_KERNEL);
        pending_grant_handles = kmalloc(sizeof(pending_grant_handles[0]) *

diff --cc linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
Simple merge

diff --cc xen/arch/ia64/xen/hypercall.c
Simple merge

diff --cc xen/arch/ia64/xen/xensetup.c
Simple merge